Changeset 16535

Timestamp:

10/23/13 15:55:06 (11 years ago)

Author:

seroussi

Message:

BUG: fixed problem with transient slope

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (3 diffs)

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

@@ -555 +555 @@
         IssmDouble xyz_list[NUMVERTICES][3];
         IssmDouble slopes[2];
+        Input*     input  = NULL;
         Input*     input2 = NULL;
 
@@ -567 +568 @@
         GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES);
         this->parameters->FindParam(&input_enum,InputToL2ProjectEnum);
-        Input* input = inputs->GetInput(input_enum);
-        if(!input){
-                switch(input_enum){
-                        case SurfaceSlopeXEnum: input2 = inputs->GetInput(SurfaceEnum); _assert_(input2); break;
-                        case SurfaceSlopeYEnum: input2 = inputs->GetInput(SurfaceEnum); _assert_(input2); break;
-                        case BedSlopeXEnum:     input2 = inputs->GetInput(BedEnum);     _assert_(input2); break;
-                        case BedSlopeYEnum:     input2 = inputs->GetInput(BedEnum);     _assert_(input2); break;
-                        default: _error_("input not found in element");
-                }
+        switch(input_enum){
+                case SurfaceSlopeXEnum: input2 = inputs->GetInput(SurfaceEnum); _assert_(input2); break;
+                case SurfaceSlopeYEnum: input2 = inputs->GetInput(SurfaceEnum); _assert_(input2); break;
+                case BedSlopeXEnum:     input2 = inputs->GetInput(BedEnum);     _assert_(input2); break;
+                case BedSlopeYEnum:     input2 = inputs->GetInput(BedEnum);     _assert_(input2); break;
+                default: input = inputs->GetInput(input_enum);
         }
 
@@ -587 +585 @@
                 GetNodalFunctions(basis,gauss);
 
-                if(input){
-                        input->GetInputValue(&value,gauss);
-                }
-                else{
-                        input2->GetInputDerivativeValue(&slopes[0],&xyz_list[0][0],gauss);
-                        switch(input_enum){
-                                case SurfaceSlopeXEnum: case BedSlopeXEnum: value = slopes[0]; break;
-                                case SurfaceSlopeYEnum: case BedSlopeYEnum: value = slopes[1]; break;
-                                default: _error_("case not supported");
-                        }
+                if(input2) input2->GetInputDerivativeValue(&slopes[0],&xyz_list[0][0],gauss);
+                switch(input_enum){
+                        case SurfaceSlopeXEnum: case BedSlopeXEnum: value = slopes[0]; break;
+                        case SurfaceSlopeYEnum: case BedSlopeYEnum: value = slopes[1]; break;
+                        default: input->GetInputValue(&value,gauss);
                 }