Changeset 18837

Timestamp:

11/24/14 11:21:37 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: do not declare vy_input twice

File:

• issm/trunk-jpl/src/c/analyses/AdjointHorizAnalysis.cpp (modified) (2 diffs)

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

@@ -368 +368 @@
         Input* vx_input      = element->GetInput(VxEnum);                                 _assert_(vx_input);
         Input* vxobs_input   = element->GetInput(InversionVxObsEnum);                     _assert_(vxobs_input);
-        Input* vy_input=NULL;
-        Input* vyobs_input=NULL;
-        if (domaintype!=Domain2DverticalEnum) {
-                Input* vy_input      = element->GetInput(VyEnum);                                 _assert_(vy_input);
-                Input* vyobs_input   = element->GetInput(InversionVyObsEnum);                     _assert_(vyobs_input);
+        Input* vy_input    = NULL;
+        Input* vyobs_input = NULL;
+        if(domaintype!=Domain2DverticalEnum){
+                vy_input      = element->GetInput(VyEnum);                                 _assert_(vy_input);
+                vyobs_input   = element->GetInput(InversionVyObsEnum);                     _assert_(vyobs_input);
         }
         IssmDouble epsvel  = 2.220446049250313e-16;
@@ -394 +394 @@
                 vx_input->GetInputValue(&vx,gauss);
                 vxobs_input->GetInputValue(&vxobs,gauss);
-                if (domaintype!=Domain2DverticalEnum) {
+                if(domaintype!=Domain2DverticalEnum) {
                         vy_input->GetInputValue(&vy,gauss);
                         vyobs_input->GetInputValue(&vyobs,gauss);