Changeset 16611

Timestamp:

11/04/13 13:49:33 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: slope was not recopmuted if already in inputs

File:

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

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

@@ -348 +348 @@
         IssmDouble xyz_list[NUMVERTICES][3];
         IssmDouble value;
+        Input*     input  = NULL;
         Input*     input2 = NULL;
 
@@ -360 +361 @@
         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 BedSlopeXEnum:     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 BedSlopeXEnum:     input2 = inputs->GetInput(BedEnum);     _assert_(input2); break;
+                default: input = inputs->GetInput(input_enum);
         }
 
@@ -378 +376 @@
                 GetNodalFunctions(basis,gauss);
 
-                if(input){
+                if(input2){
+                        input2->GetInputDerivativeValue(&value,&xyz_list[0][0],gauss);
+                }
+                else{
                         input->GetInputValue(&value,gauss);
-                }
-                else{
-                        input2->GetInputDerivativeValue(&value,&xyz_list[0][0],gauss);
                 }